From e83dca50931b342294651dc6e495c6015f5864d3 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Tue, 6 Mar 2001 22:23:05 +0000 Subject: [PATCH] Add "clicked" signal back to columns. Tue Mar 6 17:25:07 2001 Jonathan Blandford * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked): Add "clicked" signal back to columns. * ChangeLog: remove conflict markers. --- ChangeLog | 8 +++++++- ChangeLog.pre-2-0 | 8 +++++++- ChangeLog.pre-2-10 | 8 +++++++- ChangeLog.pre-2-2 | 8 +++++++- ChangeLog.pre-2-4 | 8 +++++++- ChangeLog.pre-2-6 | 8 +++++++- ChangeLog.pre-2-8 | 8 +++++++- gtk/gtktreeviewcolumn.c | 12 ++++++++---- 8 files changed, 57 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8508ed70a8..fda6577955 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Mar 6 17:25:07 2001 Jonathan Blandford + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked): + Add "clicked" signal back to columns. + + * ChangeLog: remove conflict markers. + Tue Mar 6 10:45:45 2001 Owen Taylor * gtk/gtkbutton.c: Add animation of activation by, on @@ -88,7 +95,6 @@ Mon Mar 5 14:38:54 2001 Jonathan Blandford parent_class pointer in pixbuf_style_class_init(). (Will commit the fix to the pixbuf-engine too). ->>>>>>> 1.1779 2001-03-05 Alexander Larsson * gdk/gdkwindow.h: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 8508ed70a8..fda6577955 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Tue Mar 6 17:25:07 2001 Jonathan Blandford + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked): + Add "clicked" signal back to columns. + + * ChangeLog: remove conflict markers. + Tue Mar 6 10:45:45 2001 Owen Taylor * gtk/gtkbutton.c: Add animation of activation by, on @@ -88,7 +95,6 @@ Mon Mar 5 14:38:54 2001 Jonathan Blandford parent_class pointer in pixbuf_style_class_init(). (Will commit the fix to the pixbuf-engine too). ->>>>>>> 1.1779 2001-03-05 Alexander Larsson * gdk/gdkwindow.h: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8508ed70a8..fda6577955 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Tue Mar 6 17:25:07 2001 Jonathan Blandford + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked): + Add "clicked" signal back to columns. + + * ChangeLog: remove conflict markers. + Tue Mar 6 10:45:45 2001 Owen Taylor * gtk/gtkbutton.c: Add animation of activation by, on @@ -88,7 +95,6 @@ Mon Mar 5 14:38:54 2001 Jonathan Blandford parent_class pointer in pixbuf_style_class_init(). (Will commit the fix to the pixbuf-engine too). ->>>>>>> 1.1779 2001-03-05 Alexander Larsson * gdk/gdkwindow.h: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8508ed70a8..fda6577955 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Tue Mar 6 17:25:07 2001 Jonathan Blandford + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked): + Add "clicked" signal back to columns. + + * ChangeLog: remove conflict markers. + Tue Mar 6 10:45:45 2001 Owen Taylor * gtk/gtkbutton.c: Add animation of activation by, on @@ -88,7 +95,6 @@ Mon Mar 5 14:38:54 2001 Jonathan Blandford parent_class pointer in pixbuf_style_class_init(). (Will commit the fix to the pixbuf-engine too). ->>>>>>> 1.1779 2001-03-05 Alexander Larsson * gdk/gdkwindow.h: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8508ed70a8..fda6577955 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Tue Mar 6 17:25:07 2001 Jonathan Blandford + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked): + Add "clicked" signal back to columns. + + * ChangeLog: remove conflict markers. + Tue Mar 6 10:45:45 2001 Owen Taylor * gtk/gtkbutton.c: Add animation of activation by, on @@ -88,7 +95,6 @@ Mon Mar 5 14:38:54 2001 Jonathan Blandford parent_class pointer in pixbuf_style_class_init(). (Will commit the fix to the pixbuf-engine too). ->>>>>>> 1.1779 2001-03-05 Alexander Larsson * gdk/gdkwindow.h: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8508ed70a8..fda6577955 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Tue Mar 6 17:25:07 2001 Jonathan Blandford + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked): + Add "clicked" signal back to columns. + + * ChangeLog: remove conflict markers. + Tue Mar 6 10:45:45 2001 Owen Taylor * gtk/gtkbutton.c: Add animation of activation by, on @@ -88,7 +95,6 @@ Mon Mar 5 14:38:54 2001 Jonathan Blandford parent_class pointer in pixbuf_style_class_init(). (Will commit the fix to the pixbuf-engine too). ->>>>>>> 1.1779 2001-03-05 Alexander Larsson * gdk/gdkwindow.h: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8508ed70a8..fda6577955 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Tue Mar 6 17:25:07 2001 Jonathan Blandford + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked): + Add "clicked" signal back to columns. + + * ChangeLog: remove conflict markers. + Tue Mar 6 10:45:45 2001 Owen Taylor * gtk/gtkbutton.c: Add animation of activation by, on @@ -88,7 +95,6 @@ Mon Mar 5 14:38:54 2001 Jonathan Blandford parent_class pointer in pixbuf_style_class_init(). (Will commit the fix to the pixbuf-engine too). ->>>>>>> 1.1779 2001-03-05 Alexander Larsson * gdk/gdkwindow.h: diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 0f88d5eed1..5e0ed462df 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -461,7 +461,11 @@ gtk_real_tree_column_clicked (GtkTreeViewColumn *tree_column) } - +static void +gtk_tree_view_column_button_clicked (GtkWidget *widget, gpointer data) +{ + g_signal_emit_by_name (G_OBJECT (data), "clicked"); +} void _gtk_tree_view_column_create_button (GtkTreeViewColumn *column) @@ -483,9 +487,9 @@ _gtk_tree_view_column_create_button (GtkTreeViewColumn *column) /* make sure we own a reference to it as well. */ gtk_widget_set_parent (column->button, GTK_WIDGET (tree_view)); - /* gtk_signal_connect (GTK_OBJECT (button), "clicked", - (GtkSignalFunc) gtk_tree_view_button_clicked, - (gpointer) tree_view);*/ + gtk_signal_connect (GTK_OBJECT (column->button), "clicked", + (GtkSignalFunc) gtk_tree_view_column_button_clicked, + (gpointer) column); column->alignment = gtk_alignment_new (column->xalign, 0.5, 0.0, 0.0); -- 2.30.2